Merge branch 'master' of https://github.com/gpsbabel/gpsbabel
authorRobert Lipe <robertlipe@gpsbabel.org>
Sun, 7 Feb 2016 20:41:14 +0000 (14:41 -0600)
committerRobert Lipe <robertlipe@gpsbabel.org>
Sun, 7 Feb 2016 20:41:14 +0000 (14:41 -0600)

Trivial merge